# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.1069.1.221+1.1069.221.2 -> 1.1069.228.1 # drivers/acpi/namespace/nsxfobj.c 1.15.1.1 -> 1.17 # include/acpi/acglobal.h 1.22.1.2 -> 1.25 # drivers/acpi/resources/rsio.c 1.11.1.1 -> 1.13 # include/acpi/acpixf.h 1.20.1.1 -> 1.22 # drivers/acpi/resources/rsaddr.c 1.12.1.2 -> 1.15 # drivers/acpi/executer/exoparg3.c 1.8.1.2 -> 1.11 # drivers/acpi/osl.c 1.26.1.2 -> 1.29.1.1 # drivers/acpi/hardware/hwacpi.c 1.15.1.4 -> 1.20 # include/acpi/acutils.h 1.22.1.2 -> 1.25 # include/acpi/acpiosxf.h 1.24.1.1 -> 1.26 # drivers/acpi/dispatcher/dsobject.c 1.21.1.1 -> 1.23 # drivers/acpi/hardware/hwgpe.c 1.17.1.1 -> 1.19 # drivers/acpi/executer/exconvrt.c 1.17.1.1 -> 1.19 # drivers/acpi/executer/exfield.c 1.15.1.2 -> 1.18 # drivers/acpi/parser/psscope.c 1.11.1.1 -> 1.13 # include/acpi/acexcep.h 1.13.1.2 -> 1.16 # drivers/acpi/dispatcher/dswload.c 1.18.1.3 -> 1.20.1.2 # drivers/acpi/resources/rsutils.c 1.13.1.1 -> 1.15 # drivers/acpi/utilities/uteval.c 1.15.1.2 -> 1.18 # drivers/acpi/utilities/utmisc.c 1.24.1.1 -> 1.26 # drivers/acpi/events/evrgnini.c 1.16.1.3 -> 1.19 # drivers/acpi/hardware/hwsleep.c 1.22.1.2 -> 1.25 # drivers/acpi/executer/exdump.c 1.15.1.3 -> 1.18 # include/acpi/acstruct.h 1.12.1.2 -> 1.14.1.1 # drivers/acpi/executer/exstoren.c 1.14.1.2 -> 1.17 # drivers/acpi/utilities/utglobal.c 1.20.1.5 -> 1.22.1.3 # include/acpi/acnamesp.h 1.17.1.1 -> 1.19 # drivers/acpi/hardware/hwtimer.c 1.14.1.1 -> 1.16 # include/acpi/acobject.h 1.16.1.3 -> 1.19 # include/acpi/acresrc.h 1.12.1.1 -> 1.14 # drivers/acpi/utilities/utalloc.c 1.14.1.3 -> 1.18 # drivers/acpi/utilities/utxface.c 1.15.1.1 -> 1.17 # drivers/acpi/executer/exregion.c 1.14.1.2 -> 1.17 # drivers/acpi/resources/rsxface.c 1.15.1.1 -> 1.17 # include/acpi/actbl1.h 1.11.1.2 -> 1.14 # drivers/acpi/parser/psopcode.c 1.15.1.1 -> 1.17 # drivers/acpi/events/evxfregn.c 1.15.1.3 -> 1.18 # include/acpi/acdebug.h 1.16.1.1 -> 1.18 # drivers/acpi/tables.c 1.9.1.4 -> 1.11.1.4 # drivers/acpi/parser/psparse.c 1.17.1.3 -> 1.19.1.2 # drivers/acpi/executer/exprep.c 1.14.1.3 -> 1.18 # drivers/acpi/executer/exutils.c 1.17.1.2 -> 1.19.1.1 # drivers/acpi/executer/exoparg6.c 1.7.1.1 -> 1.9 # include/acpi/acconfig.h 1.35.1.7 -> 1.37.1.5 # include/acpi/platform/acenv.h 1.12.1.2 -> 1.14.1.1 # drivers/acpi/executer/exresnte.c 1.16.1.2 -> 1.19 # drivers/acpi/namespace/nsxfname.c 1.14.1.2 -> 1.17 # drivers/acpi/tables/tbinstal.c 1.16.1.3 -> 1.18.1.2 # drivers/acpi/resources/rsmisc.c 1.11.1.1 -> 1.13 # include/acpi/actables.h 1.13.1.1 -> 1.15 # drivers/acpi/events/evxfevnt.c 1.17.1.1 -> 1.19 # drivers/acpi/parser/pstree.c 1.12.1.1 -> 1.14 # drivers/acpi/parser/psargs.c 1.16.1.2 -> 1.19 # drivers/acpi/executer/exnames.c 1.12.1.1 -> 1.14 # drivers/acpi/executer/exfldio.c 1.19.1.4 -> 1.24 # drivers/acpi/resources/rscreate.c 1.14.1.2 -> 1.17 # include/acpi/acoutput.h 1.14.1.1 -> 1.16 # drivers/acpi/namespace/nsinit.c 1.18.1.2 -> 1.21 # drivers/acpi/dispatcher/dsmthdat.c 1.18.1.3 -> 1.21 # drivers/acpi/executer/exresolv.c 1.15.1.3 -> 1.19 # drivers/acpi/namespace/nsobject.c 1.14.1.2 -> 1.17 # drivers/acpi/tables/tbconvrt.c 1.21.1.3 -> 1.23.1.2 # drivers/acpi/namespace/nseval.c 1.15.1.1 -> 1.17 # drivers/acpi/utilities/utcopy.c 1.20.1.1 -> 1.22 # drivers/acpi/executer/exstore.c 1.21.1.2 -> 1.24 # drivers/acpi/dispatcher/dsutils.c 1.15.1.2 -> 1.17.1.1 # drivers/acpi/resources/rsirq.c 1.12.1.3 -> 1.16 # arch/i386/kernel/setup.c 1.68.1.11 -> 1.70.1.9 # drivers/acpi/utilities/utdelete.c 1.16.1.3 -> 1.20 # drivers/acpi/dispatcher/dsmethod.c 1.14.1.2 -> 1.17 # drivers/acpi/namespace/nsutils.c 1.21.1.3 -> 1.23.1.2 # include/acpi/acpi.h 1.8.1.1 -> 1.10 # include/acpi/actbl.h 1.13.1.2 -> 1.16 # drivers/acpi/executer/exoparg2.c 1.17.1.1 -> 1.19 # drivers/acpi/namespace/nsalloc.c 1.15.1.2 -> 1.18 # drivers/acpi/resources/rscalc.c 1.15.1.2 -> 1.18 # include/acpi/acmacros.h 1.17.1.2 -> 1.20 # drivers/acpi/resources/rsdump.c 1.13.1.2 -> 1.16 # drivers/acpi/events/evxface.c 1.17.1.1 -> 1.19 # drivers/acpi/parser/psutils.c 1.11.1.1 -> 1.13 # drivers/acpi/utilities/utinit.c 1.15.1.1 -> 1.17 # drivers/acpi/events/evmisc.c 1.20.1.2 -> 1.23 # include/acpi/acevents.h 1.16.1.2 -> 1.19 # include/acpi/actypes.h 1.27.1.2 -> 1.30 # drivers/acpi/executer/exconfig.c 1.13.1.2 -> 1.16 # include/acpi/achware.h 1.15.1.1 -> 1.17 # include/acpi/actbl2.h 1.14.1.2 -> 1.17 # include/acpi/aclocal.h 1.26.1.1 -> 1.28 # drivers/acpi/utilities/utdebug.c 1.16.1.2 -> 1.19 # drivers/acpi/tables/tbget.c 1.16.1.4 -> 1.18.1.2 # include/acpi/acparser.h 1.13.1.1 -> 1.15 # drivers/acpi/utilities/utobject.c 1.16.1.2 -> 1.19 # include/acpi/amlcode.h 1.14.1.1 -> 1.16 # Makefile 1.190.7.4 -> 1.193.1.47 # drivers/acpi/dispatcher/dsfield.c 1.18.1.2 -> 1.20.1.1 # drivers/acpi/events/evregion.c 1.17.1.4 -> 1.21 # drivers/acpi/events/evsci.c 1.14.1.1 -> 1.16 # drivers/acpi/executer/exsystem.c 1.12.1.3 -> 1.16 # drivers/acpi/parser/pswalk.c 1.12.1.1 -> 1.14 # include/acpi/acdispat.h 1.11.1.1 -> 1.13 # drivers/acpi/tables/tbxfroot.c 1.14.1.3 -> 1.16.1.2 # include/acpi/platform/aclinux.h 1.17.1.1 -> 1.19 # drivers/acpi/tables/tbutils.c 1.15.1.1 -> 1.17 # drivers/acpi/executer/exmutex.c 1.10.1.2 -> 1.13 # drivers/acpi/parser/psxface.c 1.14.1.2 -> 1.17 # drivers/acpi/resources/rsmemory.c 1.12.1.1 -> 1.14 # drivers/acpi/dispatcher/dsopcode.c 1.17.1.5 -> 1.19.1.3 # drivers/acpi/events/evevent.c 1.23.1.1 -> 1.25 # drivers/acpi/executer/exmisc.c 1.17.1.2 -> 1.20 # drivers/acpi/hardware/hwregs.c 1.20.1.3 -> 1.22.1.2 # drivers/acpi/dispatcher/dswstate.c 1.16.1.2 -> 1.18.1.1 # drivers/acpi/executer/exresop.c 1.16.1.3 -> 1.20 # include/acpi/acinterp.h 1.19.1.1 -> 1.21 # drivers/acpi/tables/tbxface.c 1.14.1.2 -> 1.17 # drivers/acpi/executer/exoparg1.c 1.17.1.3 -> 1.21 # drivers/acpi/namespace/nsdump.c 1.16.1.3 -> 1.18.1.2 # drivers/acpi/namespace/nsload.c 1.16.1.1 -> 1.18 # drivers/acpi/executer/excreate.c 1.14.1.2 -> 1.16.1.1 # drivers/acpi/executer/exstorob.c 1.16.1.1 -> 1.18 # drivers/acpi/utilities/utmath.c 1.7.1.1 -> 1.9 # drivers/acpi/namespace/nsaccess.c 1.18.1.2 -> 1.21 # drivers/acpi/namespace/nssearch.c 1.16.1.3 -> 1.18.1.2 # drivers/acpi/dispatcher/dswexec.c 1.18.1.2 -> 1.21 # include/acpi/platform/acgcc.h 1.16.1.1 -> 1.18 # drivers/acpi/dispatcher/dswscope.c 1.13.1.3 -> 1.15.1.2 # drivers/acpi/namespace/nswalk.c 1.12.1.1 -> 1.14 # drivers/acpi/resources/rslist.c 1.11.1.2 -> 1.14 # drivers/acpi/namespace/nsnames.c 1.16.1.1 -> 1.18 # diff -Nru a/Makefile b/Makefile --- a/Makefile Wed Jan 28 15:10:28 2004 +++ b/Makefile Wed Jan 28 15:10:28 2004 @@ -93,6 +93,7 @@ CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \ -fno-strict-aliasing -fno-common +CFLAGS += -g ifndef CONFIG_FRAME_POINTER CFLAGS += -fomit-frame-pointer endif @@ -306,8 +307,7 @@ $(CONFIG_SHELL) scripts/Configure -d arch/$(ARCH)/config.in xconfig: symlinks - $(MAKE) -C scripts kconfig.tk - wish -f scripts/kconfig.tk + @echo -e "***\n* Sorry, xconfig is broken; use \"make menuconfig\" instead.\n***" menuconfig: include/linux/version.h symlinks $(MAKE) -C scripts/lxdialog all